bitkeeper revision 1.1236.1.36 (4221cfd30UrMyu3TpXKGjVNXNVS1Bw)

Update 'xen version' in guest-OS images to 3.0.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/extras/mini-os/x86_32.S b/extras/mini-os/x86_32.S
index d193b121bdde44433cc5fd58c9b9906bf9303a5e..c02048f9a08100a23a3d2c19ad653f9dfe3fa8c8 100644 (file)
--- a/extras/mini-os/x86_32.S
+++ b/extras/mini-os/x86_32.S
@@ -1,7 +1,7 @@
 #include <os.h>
 
 .section __xen_guest
-        .asciz  "XEN_VER=2.0,LOADER=generic,PT_MODE_WRITABLE"
+        .asciz  "XEN_VER=3.0,LOADER=generic,PT_MODE_WRITABLE"
 .text
 
 .globl _start, shared_info

diff --git a/extras/mini-os/x86_64.S b/extras/mini-os/x86_64.S
index 0f37d596f7b379d7b91a7736aec3e7b17f0e1e99..d5cf9badd73e631583695205bf9e4036fa9f0189 100644 (file)
--- a/extras/mini-os/x86_64.S
+++ b/extras/mini-os/x86_64.S
@@ -1,7 +1,7 @@
 #include <os.h>
 
 .section __xen_guest
-        .asciz  "XEN_VER=2.0,LOADER=generic,PT_MODE_WRITABLE"
+        .asciz  "XEN_VER=3.0,LOADER=generic,PT_MODE_WRITABLE"
 .text
 
 #define ENTRY(X) .globl X ; X :

diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/head.S b/linux-2.4.29-xen-sparse/arch/xen/kernel/head.S
index d48bb7098db2710184144d947e7dba03bc60b77b..cda41ae56ca7e012ff0324315618476dcf88552e 100644 (file)
--- a/linux-2.4.29-xen-sparse/arch/xen/kernel/head.S
+++ b/linux-2.4.29-xen-sparse/arch/xen/kernel/head.S
@@ -1,6 +1,6 @@
 
 .section __xen_guest
-    .asciz "GUEST_OS=linux,GUEST_VER=2.4,XEN_VER=2.0,VIRT_BASE=0xC0000000"
+    .asciz "GUEST_OS=linux,GUEST_VER=2.4,XEN_VER=3.0,VIRT_BASE=0xC0000000"
 
 .text
 #include <linux/config.h>

diff --git a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S
index 3d2d8947a4ca545efa5600ec1ec55658c76ee6a0..8b998ea0030f69463809a25032868d1ac02d03b2 100644 (file)
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S
@@ -2,7 +2,7 @@
 #include <linux/config.h>
 
 .section __xen_guest
-       .ascii  "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=2.0,VIRT_BASE=0xC0000000"
+       .ascii  "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0xC0000000"
        .ascii  ",LOADER=generic"
        .ascii  ",PT_MODE_WRITABLE"
        .byte   0

diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S
index ed0946cb9b2bcbe1f3229863f025307a39b1c38f..a8967d75cb622904c97da5eec1ecf49d5fe49c65 100644 (file)
--- a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S
+++ b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S
@@ -180,7 +180,7 @@
  * Xen guest identifier and loader selection
  */
 .section __xen_guest
-       .ascii  "GUEST_OS=netbsd,GUEST_VER=2.0,XEN_VER=2.0"
+       .ascii  "GUEST_OS=netbsd,GUEST_VER=2.0,XEN_VER=3.0"
        .ascii  ",LOADER=generic"
 #if (NKSYMS || defined(DDB) || defined(LKM)) && !defined(SYMTAB_SPACE)
        .ascii  ",BSD_SYMTAB"

diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
index 12753b78a6aedd07aeb0f02860e199766c51b246..8f7a979d756334b8f9e803535ace43eee8db00e8 100644 (file)
--- a/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@ -538,7 +538,7 @@ static int parseelfimage(char *elfbase,
             return -EINVAL;
         }
 
-        if ( (strstr(guestinfo, "XEN_VER=2.0") == NULL) )
+        if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
         {
             ERROR("Will only load images built for Xen v2.0");
             ERROR("Actually saw: '%s'", guestinfo);

diff --git a/xen/common/elf.c b/xen/common/elf.c
index 75ab4da4dede913a2e79088fe942bb7f2363cef9..38cbb30db0b11ea50b2e487ebc94de168725a421 100644 (file)
--- a/xen/common/elf.c
+++ b/xen/common/elf.c
@@ -76,7 +76,7 @@ int parseelfimage(char *elfbase,
             return -EINVAL;
         }
 
-        if ( (strstr(guestinfo, "XEN_VER=2.0") == NULL) )
+        if ( (strstr(guestinfo, "XEN_VER=3.0") == NULL) )
         {
             printk("ERROR: Xen will only load images built for Xen v2.0\n");
             return -EINVAL;